auto upstream
authorJoakim Verona <joakim@verona.se>
Fri, 21 Dec 2012 08:01:26 +0000 (09:01 +0100)
committerJoakim Verona <joakim@verona.se>
Fri, 21 Dec 2012 08:01:26 +0000 (09:01 +0100)

Trivial merge